Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 21 Jan 2011 20:27:07 +0000 (12:27 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 21 Jan 2011 20:27:07 +0000 (12:27 -0800)
commitd9e857e86fce6465f734e1410b002218da25f294
tree6a2fc84506046c3bafc46c761d7454becd908c31
parent95b29e3598cf928e36170a4c7a1241a068224e2f
parent829e5e591cb5b6c6ae60bfb00f10f67746f52201
Merge from mainline.